From: Florian Müllner <fmuellner@gnome.org>
Date: Mon, 10 Jul 2023 04:04:07 +0000 (+0200)
Subject: extensionBase: Stop injecting extensionManager
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~337^2~1^2~92
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=abdd1346da8011ad002edbe18dc8961138895b16;p=gnome-shell.git

extensionBase: Stop injecting extensionManager

All extension lookups now happen through the dedicated
Extension/ExtensionPreferences classes, so the shared
code no longer has to access the extensionManager.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2838>
---

diff --git a/js/extensions/extension.js b/js/extensions/extension.js
index cdbc33da7..2e06b3dfe 100644
--- a/js/extensions/extension.js
+++ b/js/extensions/extension.js
@@ -1,7 +1,6 @@
-import {ExtensionBase, GettextWrapper, setExtensionManager} from './sharedInternals.js';
+import {ExtensionBase, GettextWrapper} from './sharedInternals.js';
 
 const {extensionManager} = imports.ui.main;
-setExtensionManager(extensionManager);
 
 export class Extension extends ExtensionBase {
     static lookupByUUID(uuid) {
diff --git a/js/extensions/prefs.js b/js/extensions/prefs.js
index ab0a74dd2..d60859a3d 100644
--- a/js/extensions/prefs.js
+++ b/js/extensions/prefs.js
@@ -1,10 +1,8 @@
 import GObject from 'gi://GObject';
 
-import {ExtensionBase, GettextWrapper, setExtensionManager} from './sharedInternals.js';
+import {ExtensionBase, GettextWrapper} from './sharedInternals.js';
 import {extensionManager} from '../extensionsService.js';
 
-setExtensionManager(extensionManager);
-
 export class ExtensionPreferences extends ExtensionBase {
     static lookupByUUID(uuid) {
         return extensionManager.lookup(uuid)?.stateObj ?? null;
diff --git a/js/extensions/sharedInternals.js b/js/extensions/sharedInternals.js
index ac6d035a8..2f8e28710 100644
--- a/js/extensions/sharedInternals.js
+++ b/js/extensions/sharedInternals.js
@@ -6,18 +6,6 @@ import {bindtextdomain} from 'gettext';
 
 const Config = imports.misc.config;
 
-let _extensionManager = null;
-
-/**
- * @param {object} extensionManager to use in utilities like `initTranslations()`
- */
-export function setExtensionManager(extensionManager) {
-    if (_extensionManager)
-        throw new Error('Trying to override existing extension manager');
-
-    _extensionManager = extensionManager;
-}
-
 export class ExtensionBase {
     #gettextDomain;